Camera improvements, fixes, unit tests