Fixed bug
Improved test passing