Updated tests. Test are all passing