Updated spec helper
Merge branch 'development'