[NEW] tests & fixes