Fixed tests so that they actually work