tweaked name of test
separated stuff into their own files