Groundwork for unit library, fixed test cases failing because of performance profiling