added initial testing and some small changes