updated tests and alyout