add the test to run, and more fixes