Removed test related calls from the main code.