UPDATE

Add to tests, TODO notes