Some Updates and Tests