Fix helpers and helper specs
Fix all decorator specs