quickfix
some todo tests