fixes,removed unused tests