Removed unecessary feature
Improved tests