Fixed failing unit tests, prepare for technical sprint