Refs #94 - Refactor test for code style