fixed some stuff in tests