Better testing and rationalisation of access control stuff