minor changes due to starting writing tests, no tests yet though
dummy test files now included, don't do anything really yet