cleaned up some test, added stories