Added camera tests + fixes