add more tests and change theme again