fixed type assertion
uncommented a bunch of tests