Reverting Unit tests to proper focus