Update unit test module and test classes to prevent database connections leak
Remove redundant classes