working on testing issues