Changed tests to be accurate to generated scaffolding