Updted tests and added testling