Fix test, cleanup source