Added some more tests. Fixed compile issue