fix otest
add moar tests