Feature/now 267

Refactored part of the test as per Michael Pettiford's advice.