Removed scaffolds, added specs