[SQUASH ME] small changes during tests
[SQUASH ME]