Added 'roundBy' to the unit testing. Made more remediations based on the testing