Moving unit tests to test source folders #439