Workin workin workin on the tests