Fix NPE
Move tests into the test project.