Dockblock fixes, added tests