refactor for testing ease, add a single test