Added tests and styles