Updated test setup and deps