fix testing issues