Fixed tests, added tests for split local versions