Fix failing specs and features

This fixes the failing rspec specs and cucumber features (also includes #541 because many specs are failing due to missing new line characters)

- Closes #541
- Closes #544