fixing some tests
finally, got most of the tests going on at least the basics