Fixed up javadocs a bit and separated tests