Fixed and reorganized tests and deps