Unit tests working # 1
unit tests working # 2
Unit tests working # 3