Fix compile error in test project
Shuffle tests into NUnit fixtures and format