remove obsolete FIXME comments
add a few tests