Added Tests for stuff