All inner function and tests working
cleanup