more tests and shiz