Re-namespaced tests for more consistency
More work on unit tests
Outdated pre-restructure todo's removed