feature test implemented
done 34
merged
merged