Demo test for Edmund
Refactoring structure