Finally getting tests sorted

Using the Test Framework lib