Updated gems and cleaned tests files

Yeah yeah, these should be multiple commits. But now the stage is set to
start writing tests!