commit to pull
added unit testing capabilities
resolved conflicts