streamlined testing, still bugs