Fixed the isset function
Added some more tests