Feature/corrections

Removing unit tests as these tests cause our Jenkins builds to fail