updated annotations; added test assertions