Reformatted tests & written tests to build to