added some better tests