Reformatting the classes along with some more additional tests