improves test coverage on track and stage pages
cleans up variable names