Fix broken build and added a test