Updated testing to include all, and work