Began adding test code