tidy-up tests.
Build Dependencies.
mv deprecated code to scrap.