Memory leak fixed
Return-value testing fixed