Merge "Cleaning test repository - removing old tests"