MUS-94: Note Tests Round 2

Refactoring