update: updating src & test to working versions; fixme: horizontal scrollbar