fixes for 2.0 changes and LocalCKAN, more tests