more tests; fixing stuff