Fixed some testing issues