Refactor and fixing up unit tests