#5 resolved and tests cleaned