starting tests
add the expectations
fix stuff