JUnit tests

Remember that changes to the import.sql will break these tests. 

Close #94. Close #95
Merge branch 'master' into server