Start putting in tests