Made more changes to test