Refactored pymk tests.