fixed bug and starting test refactor