Adding tests :+1:
Merge