Better scaffold tests also some deploy notes