removed/fixed 2 old tests