Adding some Unit tests