Code cleanup
Additional comments for tests