reorganized unit tests slightly - #82