tests refactored and view centered