Tests all fixed after major refactor - likely unstable code still