Feature #46, tests refactored