Added some tests and stuff