Reformatted tests. In the process of undoing testing of private functions