fix some tests + stuff