Implemented some more test logic(incomplete).
Finished up unit test helper function(untested).