Removed unit tests which we don't use anyway