Fixed tests and styles