moved unittests, moved variables into init, items added