Added tests and output