better tests (exposed a bug)