prepped for testing

adding testing from my old version to master version