Testing fixes: 1