Did minor modifications to the testing system in order to get rid of deprecated calls. Also, some minor imports have been cleaned up