WIP - Test refactoring
Most test working, apart from Time Jobs