IMplemented slightly more lightweight logging for testing