Fixed tests, removed dancer syntax