- added more test cases
- fixed a bug in test script which prevented errors to show up...

R=r
OCL=23832
CL=23974