finished testing
added proper logging