Modify unit tests to follow new file structure