light formatting
Improving test coverage
Removed arty again