reorganize tests so coverage is meaningful