Fixed test not following stucturing convention, renamed tests where needed. Naming things, i still suck at it