fixing tests and styles