update/cleanup tests