Resolve "Switching to src layout"

Closes #1206 (closed)

The main advantage of using src layout is that you can make sure that you are using the proper code during the test...