Unit Tests fixed, removed way too overloaded persistence function set