cleanup & more tests