TODO: updated with test framework ideas