Added some tests and fixed a few small things like removing System.out.printlns