#gjmsdev - First unit tests. Reverted structuring.