Added test dependencies + test cleanup.