Change module requires and add testling