Acceptance tests finished. Unit tests for factories. Fixes.