Made more formatting and test passing