add and clean up integration tests,
improve use of CanCan