Yet more styling changes. Changed tests accordingly