completed renaming, added state field with initial tests, added guard for tests