Fixed typo / tests and bugs
Fixed namespaces and added some tests