Some tests, mostly skeletons added