Removed scaffolded specs, corrected other specs and fixed some stuff.