Made tests better
Added further-customizations