fix test suite and improve requires