Begin to add unit testing for the new implementation