Add HasLocator to TestCases
Move custom assertions to a separate trait
Add some custom assertions