minor test cleanup
add all tests and clean up controller api