Added testing fixes