Finish up object modifications, add to test