test fix/cleanup