Testing and bug fixes @1:28