Work to make #27 as won't fix and remove finished part.
Fixes #42(Move test config and test util source files out of app folder to test related folder)