Refactored Tests

malinow5