Fixed some issues with testing