Upgrading sql script for test to clear data each test
Fixed null checking in classes
Completed all required tests