Presentational classes added and tested