more unittests and misc code blocks
adding more stuff, removign a failing test