Order tests to be more intuitive
Pull classes up from  folder