BasicTests refactoring