Removed old unit tests