Minor bug fixes
Add test watch image