Added dependencies and test utilities