More testing; still bugs