tests updated for bugs