Move two unit test classes from  directory to  directory to avoid compile dependency error