ACA-101 #comment added proper return for error handling, added tests