FIX: more tests