move cd into tests/base, refactor a bit, remove test that makes less sense now