Tests Fixed (were not compiling because of changes in the APIs)