Refactor Micro Tests