Added override annotations, fixed 'setup' method visibility