Refactor tests, remove let