Removed unit tests