reenabled unit tests and removed use of temporary vector variables