updated unit test classes
Remove backup files
layout update
clean unused files