CAW-4 | Bugfix testing