Add more tests and stuff