Fix specs which left broken builds in the db
Merge branch 'master' into bugs/63
Fix more specs that leave broken builds