tests
added states and fixed layouts