Adding tests &wrapper - not done