Added some dummy tests

Also, minor bugfixes