configurations fixed, more tests