Some refactoring to helpers and test location select added