Add tests for Exposition class
Merge work from home"
Tidy up layout