fix'ed tests