tweaked, rearranged some tests