Moving to make maker, and moved test files over to propper filename (but they still dont work)