Acceptest revised, android bugs fixed after acceptest