refactor location asserter
refactor tests