fixed some issues with testing