- added tests to verify scheme is being set correctly