Start adding tests
Change setup scripts somewhat, including test discovery