Junit testing done. I hope.