fixing stuff to pass the tests