Creating the separated test files for better management of test-cases. Does not work at this time. Use the earlier tag unified1.0.0 for working version till this is buildable