Modified code deletion, added unfinished tests
Merge branch 'master' of github.com:carolinemarcks/blockytalky-ror