Remove with and with_mut methods for simplicity
Fix tests and implement find and find_mut tests