Made tests first class so they are easier to run