simplify and update rails tests

@jamesarosen
see below ;)