added testing suite
merged filling-in-layout branch