test, flaw fixes