Clean up directory copying, get tests passing