Reverted unit tests