Fixed tests, simplified PWQueue