more tests; fixed assertions