Added tests and changed some framework names