renamed some things and added a test