Made JUnit.

Also made some methods for testing purposes and moved stuff around.