this whole tests needs some cleaning up before we merge it back. i'll look into it