Added new test that made necessary some improvements on classes