Required modules added. Test improved.