Added logger and test