Fixed tests... ops!