Removing controller test scaffolding
Removed references to deprecated columns
Merge branch 'master' of https://github.com/cthielen/chekhov