-- fixing tests
-- moving core library dependencies to the main deps
-- trying to get the right dependency order