Ironing out some testing issues