Added tests and associated libraries