Update and rename code to compass test code