added test stubs and some edits