Bug fixes and cleanup

Small cleanup in tests logging and position updating