Reorganise RSpec checks