Fixed testing issues