Removing const's
Fixing unittests... again...