Compilation passed. Test re-writing to follow