* tests & fixes