finalising structure; adding initial test