Test refactor. Made 1st test more declarative and added some helper methods to make things read a bit easier