Feature #53, refactored testing