Adding tests &wrapper - not done
tweaking tests