Updated tests and fixed issues #1 and #2