Basic units fixed and tested