simplify to avoid using split header
add some debug input to tests

trying to sort out travis