Fixed some more unit tests and moved the local package for da down