Tests: mostly working! Still one tiny issue to fix.