Tests added , missing features implemented