JUnit // 4.03

Tests for database
Minor changes