more tests, stuff needs fixin