better tests :)
still better tests