Fixed a namespacing issue
Fixed some errors and bugs
Added tests