Tests again (and some fixes)