Fixed tests so they are passing now