Improved Units Test