Fixing git repo
secondary merge of local branches, final parts to come
Removed activity tests, left some base code in, as they seem to not want to function currently. Fixed issues with some tests starting with capital letters, resulting in them not running. Test for cachedmanager load() fails, needs a fix.
Second attempt at merging JonsBranch. Corrected some test cases. Known issue: Running a second test on the same emulator causes a crash while testing the UI. Unknown cause currently - all tests working otherwise.