Fixed #1, Updated tests