Fixing tests, making services and controller work in practice