Added some more tests, made some more functions public