Playing more
Revisited tests and it works now
Added tests