Fixed tests so that they work.