fixed build, changed test to use new functions