smaller tests & now fixed