Updating tests for most modules