Small tweeks / Tests