Fixed some formmating issues and ensured tests are working correctly.