updated basic testing setup
added tests
removed deprecated funciton