Updated to add unit testing across the project