Cleanup, introducing link factory and acceptance tests