File format difficult to develop needed tests.

[glnnlhmn]

Project file layout makes test development more difficult.

I reworked the project structure and developed some of the required tests.