Implementing tests and hidden_unit0
merge stuff