Test fixes.
- Fixed many tests due to problem with zombie usage