Modified unit tests: now using only public attributes/methods