history&location tests naming and small refactoring