Added tests and updates sole core